Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only apply include labels filter if include_labels not empty #827

Merged
merged 2 commits into from
Feb 12, 2024

Conversation

samuelbray32
Copy link
Collaborator

Description

Small bug fix in SortedSpikesGroup.filter_units()

  • if include_labels is non-empty, unit labels must have at least one label from this list to pass filtering
  • PR fixes a bug where all units were filtered out in empty include_labels case

Checklist:

  • This PR should be accompanied by a release: no
  • (If release) I have updated the CITATION.cff
  • I have updated the CHANGELOG.md
  • I have added/edited docs/notebooks to reflect the changes

Copy link
Collaborator

@edeno edeno left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this runs into this warning:

DeprecationWarning: The truth value of an empty array is ambiguous. Returning False, but in future this will result in an error. Use `array.size > 0` to check that an array is not empty.

Since include_labels is a numpy array. But changing it to include_labels.size > 0 should work

@samuelbray32
Copy link
Collaborator Author

I think this runs into this warning:

DeprecationWarning: The truth value of an empty array is ambiguous. Returning False, but in future this will result in an error. Use `array.size > 0` to check that an array is not empty.

Since include_labels is a numpy array. But changing it to include_labels.size > 0 should work

You're right, I forgot it was made into a np array above

@edeno edeno merged commit b7a81d4 into master Feb 12, 2024
9 checks passed
@edeno edeno deleted the fetch_spikes_quickfix branch February 12, 2024 20:20
edeno added a commit that referenced this pull request Feb 20, 2024
* Fault-permit insert and remove mutual exclusivity protections on Merge (#824)

* #719, #804, #212

* #768

* Add merge delete and populate

* Changes following PR review @edeno

* Replace delayed import of ImportedSpikeSorting

* Update CITATION.cff (#826)

* Update CITATION.cff

* Update change log

* Update ref

* Add MUA notebook and fix numbering.

* Only apply include labels filter if include_labels not empty (#827)

* dont skip unit if include_labels list is empty

* update check for np array size

* gh-actions docs fixes (#828)

* Update 'latest' in docs deploy

* Docs bugfix. Rename Link action, incorporate cspell.

* MUA as own heading

* Update README.md

* Fix citation

* Fix citation

* include all relevant restrictions on video file

* Proposed structure for user roles. (#832)

* Add roles

* Remove use of unix user group. Add note for retroactive role assign

* Add docs on roles and external tables. Reduce key length

* Fix test for update of position tools (#835)

Related to single LED halving the data bug

* fix build error in mamba and restriction for dlc

* flush stdout before converting mp4

* Fix notebook name (#840)

* remove deprecated yaml.safe_load function

* Fix test

* replace deprecated yaml.safe_load function

* only call no_transaction_make if video key not present

---------

Co-authored-by: Chris Brozdowski <Chris.Broz@ucsf.edu>
Co-authored-by: Eric Denovellis <edeno@users.noreply.github.com>
Co-authored-by: Eric Denovellis <edeno@bu.edu>
edeno added a commit that referenced this pull request Feb 21, 2024
* allow for  multicamera epochs

* change VideoFile definition

* update video_file_num iteration

* add update methods

* change VideoFile restriction in get_video_path

* modify formatting in position_dlc_project

* allow selective video selection in pose estimation

* add NotImplementedError to DLCProject insert

* allow for video file addition after proj creation

* fix add_video_files

* fix video_file_num determination in VideoFile

* modify add_video_files method

* change call to add_video_files

* modify interval_list_name call

* Fix linting errors

* Tested DLC multicam pipeline  (#841)

* Fault-permit insert and remove mutual exclusivity protections on Merge (#824)

* #719, #804, #212

* #768

* Add merge delete and populate

* Changes following PR review @edeno

* Replace delayed import of ImportedSpikeSorting

* Update CITATION.cff (#826)

* Update CITATION.cff

* Update change log

* Update ref

* Add MUA notebook and fix numbering.

* Only apply include labels filter if include_labels not empty (#827)

* dont skip unit if include_labels list is empty

* update check for np array size

* gh-actions docs fixes (#828)

* Update 'latest' in docs deploy

* Docs bugfix. Rename Link action, incorporate cspell.

* MUA as own heading

* Update README.md

* Fix citation

* Fix citation

* include all relevant restrictions on video file

* Proposed structure for user roles. (#832)

* Add roles

* Remove use of unix user group. Add note for retroactive role assign

* Add docs on roles and external tables. Reduce key length

* Fix test for update of position tools (#835)

Related to single LED halving the data bug

* fix build error in mamba and restriction for dlc

* flush stdout before converting mp4

* Fix notebook name (#840)

* remove deprecated yaml.safe_load function

* Fix test

* replace deprecated yaml.safe_load function

* only call no_transaction_make if video key not present
---------

Co-authored-by: dpeg22 <dpeg22@gmail.com>
Co-authored-by: CBroz1 <CBrozdowski@yahoo.com>
Co-authored-by: Samuel Bray <sam.bray@ucsf.edu>
Co-authored-by: Chris Brozdowski <Chris.Broz@ucsf.edu>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants